gdm: fix empty real name check

gdm_user_get_real_name() checks for an empty real
name and automatically falls back to username if
real name is NULL.  It doesn't automatically fall
back to username if real name is empty, however.

This commit makes it fall back for both cases.

https://bugzilla.gnome.org/show_bug.cgi?id=644765

diff --git a/src/gdmuser/gdm-user.c b/src/gdmuser/gdm-user.c
index 735c2cb7414b1cfb5414bf49a8442c9f3799dced..0a592cc6af6f7a9fd0988bcae15840f6267b3e79 100644 (file)
--- a/src/gdmuser/gdm-user.c
+++ b/src/gdmuser/gdm-user.c
@@ -407,7 +407,9 @@ gdm_user_get_uid (GdmUser *user)
  * gdm_user_get_real_name:
  * @user: the user object to examine.
  *
- * Retrieves the display name of @user.
+ * Retrieves a displayable name for @user. By default this is the real name
+ * of the user, but will fall back to the user name if there is no real name
+ * defined.
  *
  * Returns: (transfer none): a pointer to an array of characters which must not be modified or
  *  freed, or %NULL.
@@ -417,7 +419,12 @@ gdm_user_get_real_name (GdmUser *user)
 {
         g_return_val_if_fail (GDM_IS_USER (user), NULL);
 
-        return (user->real_name ? user->real_name : user->user_name);
+        if (user->real_name == NULL ||
+            user->real_name[0] == '\0') {
+                return user->user_name;
+        }
+
+        return user->real_name;
 }
 
 /**